Removed potentially terrible code