[#QUAR-6: Removing unnecesary commands]