Removed some code that seemed suspect