Removed some further unused stuff