some local modifications
removed redundand file