Final, final touches

Deleted unnecessary code