Remove unused code + Update disabler end + Fix