cleaning code
fixing migration