Clean up unnecessary code
Automated source refactoring