Updated version to 0.4, cleanup