Remove Modal
 Remove remnants code of Modal and Magelan
 Remove remnants code of Modal and Magelan