Remove unnecessary files + code style fixes