Removed unwanted piece of code