MUS-91: removed dead code

got rid of some dead code and fullfilled todos