Cleanup and Copyright stuff removed