Cleaning up
Still constraint conflicts are not checked