cleanups to hopefully make this work