Another cleanup. Thats why I'm so lazy to publish code...