Remove unused parts, redesign