Removed some stuffish stuff