Removed dead code, cleanup

keywords as a type are dead