small changes to make it build and remove obsolete files