Remove $interval & optimize stuff