Clean up 

Cleaned up some random missing code or some out of place code.