Removed and simplified couple things.