small fixes, removed inactual stuff