A lot of updates to remove Kaushik's commented out code.