Some cs fixes. Also removed unused command