Cleaning up stray code