Remove debugging functions
Code-refactoring (this will break things)
Refactoring.