Reformated files + removed unused again