cleaned some old commands and removed debug comments