Removed broken/unneeded comments and code