Some changes and first attempts to remove payments