Major update
Delete mess