Removed unused apptypes, refactored OTAP to DTAP