Fixed dm code + removed code not needed