add control types
remove unused code