Small clean up moved to new package name