Build 0.5.29 - Cleaning up