Cleaning up implemented