Removing some stuff, soon I will do an cleanup