DDPF_NORMAL support, some cleanup