Removed dead code and added overrides