Move ArchiDroid Detect to proper block, clear useless comments