Removal of some broken config stuff
Update build