Remove unused code to release-0.0.1