moved to new versions and cleaned up