Cleaned up TUPTControl code