Fixed versions task, removed states modules