Cleanup
Make things java 6 compatible again