Add some messages for debugging and remove some useless options