Removed old module references; 0.1.6