Removing redundant tests comments and dead code