Version1

small changes to remove unused code.