cleanup of messy dd62ed229d85f28d1ff1d8c8709c736978e22ca3