Removed some kruft