Removed things for fixing