Removed questionable code