cleaning up Mathias stuff I dont need or want or understand