remove auto instantiate all classes code