Master branch cleaned