Cleanup

This contains a fix for the build caused by changing case for BeanWithTimeZone as well as some cleanup commits.