compiler clean-up