Revert "Maybe i can clean this up too"

This reverts commit d2fd262c4dc1f23af6f665efcbd478fc51a7135f.