Updated to hide commands which are not used and may cause slow-ness