Removed some unnecessary stuff.