code cleanup | removed unneccessary commands | misc