Cleaned some unneeded code

Cleaned some unneeded code