Clean up

Cleaned up old code and commented out blocks