Build 0.0.41 - Cleaning up