Minor cleanup, removed warnings and unused stuff.