cleanups and added mu-plugins