Refactor to remove Timelapse stuff until its done