Charlene: Refactoring and cleaning up unused methods