Cleaned up some unused commands