Code cleanup

Removed commented and leftover code