removed non-agile stuff