Revert "cleanup... most likely wont work"

This reverts commit 282dc9ca510512c1d92a58ba3d55fc81e6baddaf.