Removing current_state property from task because it's unecessary
More work on MR views