trying to reduce the cross-platform headaches by not committing bundles
more cleanup of stuff