Clean up

Various cleaning
removed useless room
removed self or changed to this where it wasn't necessary