cleanup and current version added