Some clean up in master