clean up numix stuff, separate out my stuff