Cleaned up code again

Removed unused Serializable imports and got rid of default license
headers