Code clean-up and some hidden assets.