Removed some uneeded things