remove testing parts & move strings to xml