More cleanup

*All JUnit tests run successfully
*Removed obsolete import statements
*Added serial version numbers where needed