Added usage info, removed unnecessary method, CS fix