remove qos.h
remove commented return statements, not needed anymore