Large cleanup of the codebase, and only the start...