Cleanup for Version 0.3.5000