Removed fixes