Removing the redundant WCS and changing how units are handled