wip: removing more comments etc, cleaning mess