Removed some redundant stuff