Cleaning more code

I don't think I removed anything importent