Started cleanup for pre-alpha version