Removed work and cleaned up again