Currently working as yesterday

Starting code cleanup while waiting for Stefan.