Cleaned up some unnecessary stuff (overrides and casting)