Adjusted new and cleanups