Attempt to clean up