Removed some stuff, development is really at master, i suppose