Some stuff to clean the repo up