Clean stuff, Architecture fixes