Small fixes, removed stuff not needed