small fixes
old code removed