removed empty code
removed dependencies
fixed lack of router updating; data is update manually when needed, for now