Removed unecessary nulls and false flags.