Did some code deletion and refactoring, and everything still seemed to work.