30C3 Refactoring: Remove junk