Cleanup

Cleaned extraneous code