cleanup + using local angular as network is bad