remove obsolete funcs
rework delete functionality