cleaned up code, removed bad core requirement search options