Back to weekday integer for er hour day attribute. Removed a bunch of unused stuff