Almost done
Removed stuff
Done