Removing things that aren't used in this project, and somethings that aren't supposed to be in .h files anyways