Remove graphite, move into module