remvoed some cruft