Small preparing for 0.5.0
Cleanups.
Cleanups.