Forgot code cleanup and getter notification