Yeah I was having a problem with the mixins so I just kept it that way. But good idea maybe I could create a cleanup module