Continuing changes to make labs more general

Removing specifics about labs submission, etc.