Removed old CPT UI Plugin
Merge branch 'patrick' into dev