remove manifest; wasn't needed anyway
fix typo
code layout
remove unused implicit parameters