Removed not needed whirls stuff