Updated dispose functions
Updated dispose functions for cml components