Removing code not needed