Remove weird main
Tidy up