Charlene & Justin: Refactoring advice from Pat and removed a lot of unused code