frandom: Added to build, plus cleanup of useless stuff