Overrides and cleanup