Minor: Custom Manor image cleanup
Minor: Custom Manor image cleanup