Remove potentially unnecessary code

Removed code in the hope that it would become clearer for someone to figure out why it's not working