Update Issue #373: Removed system/model
Fixed issue: Fixed typo
Fixed issue: Cleanup Page Model
Fixed issue: Cleanup Page Controller