Cleanup a liitle bit. Removed unused stuff..,