Cleaned code, removed support mccore