Remove hacky solutions