removing unused controlleres
updates, bugfixes