removing unused files, getting ready for commiting to upstream