Cleaned out some ambiguous crap