clean up architecture