Removed functionality which was moved into first stage already.