Remove functions and tests which are not used anymore