Removed stuff from the validation branch a, so this branch now follows master