Cleaned up remaining hibernate stuff