Removed old stuff. Updated for v0.6.0