move haspointer & hasvalue classes one level down
remove timer values