removed the most part of angualar for now