Some clean-up works to get clear for starting