Cleanup code again