removed unused dependency
naming cleanup
fake module support