Remove non-separations stuff & organize