Removed some redundant things