Removed cs606 stuff