Preparing to release version 0.4
Removed unused code.