small changes, removed unused file