more fixes, removed some unneeded things