Remove unneeded comments and migration