Removed some code that was actually doing nothing except being confusing.