Removed improper disposed methods