Removed refrences to serviceUsername due to deprication
Updated date formats