Removed some unnecessary left-overs.