trying to clean up this whole subgit shitshow