Removed non-working features.