Removed and fixed