removing dead code and plugin tests