throw out some old stuff
copied the changes to jWic project.