Removed unsused observables. Added mapping data from phpinput (angular request)