Removed some more unrelated stuff