Clean overrides and declarations