variable cleanup
remove unused mixin