Removed some logic in preparation of workshop