Cleaning up, removing redundant code.