Now compiles with gcc 4.7, removed object files