cleanup no used code and removed junks