Added scheduler; removed unnecessary controller