Removed some more not used stuff