remove getInstance methods from classes; simplify.