fixing issue wit dev version; cleanup