Removed dead stuff