Removed unwanted evil code