Removed more unrelated stuff