remvoing some cruft