Prepare for adding forecast and remove unused