God commit with a big cleanup