Remove some not-needed yet features.