small fixes, removed obsolete file