Removed unnecessary using and overrides