Cleanup

Removing redundant data and comments