more refactoring; cleanup of compile; removing plugins: