Remove unncessary views and modify migration