Remove unused file, fix style