Mass cleanup, left simple service+api example with single controller