Removed unneeded supports (for now)