Remove unused "use" statements
Remove unsued code until configuration is defined
Remove unused code