cleanup some nonsense thanks df