Removed template overrides
Removed template overrides
Code cleanup, removed old commented code