Removing current_state