Remove legacy code
Re-enable reservations
Java: clean warning