Direct cleanup in master branch