Attempt at cleaning enabled plugins code - not yet finished