Removed some specific code that shouldn't be here