Cleaned previous merge