Moved unused stuff; fiddling