minor fixes
deleted unfinished functionalities, to keep main repo code clean