Cleanup

Removed extant code