Verion 0.1 (stable) cleanup