diff --git a/.gitignore b/.gitignore
index 1d8b588..029ff3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 Makefile
+test-driver
+.libs
+src/*.lo
+*.la
 Makefile.in
 configure
 libtool
diff --git a/COPYING b/COPYING
index b55f06b..6ccebc0 100644
--- a/COPYING
+++ b/COPYING
@@ -693,20 +693,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 Copyright (c) 2005-2009 Collecta, Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Makefile.am b/Makefile.am
index 418cb6d..60cd46b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,11 +11,8 @@ STROPHE_FLAGS = -I$(top_srcdir)
 STROPHE_LIBS = -lstrophe $(PARSER_LIBS) $(SSL_LIBS)
 
 ## Main build targets
-#lib_LIBRARIES = libstrophe.a
-
 lib_LTLIBRARIES = libstrophe.la
 
-
 libstrophe_la_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS)
 libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \
 	src/event.c src/handler.c src/hash.c \