Code cleanup

Minor code cleanup and full removal of the licensing system.
Code Cleanup