Initial push
Removing legacy stuff, other things