Final Cleanup for controldev