cleaned up some lingering commented code