Cleanup of usage of Polymorphism