Removing stray code