Fixed issue: Some cleanups