cleanup code, remove unneeded files, fix storage settings fc