Cleaning up old code

Cleaning up old code