Cleanup - Refactoring- Code Drop