removed temporary drive controls
removed utility class