Cleanup

THis should be the masterbranch now