Everything got a bit crazy. Did a cleanup