cleaning up grabage to make room for easy debugging and a cleaner codebase