Added back in comments and removed dead code