Remove a lot of junk, fix no param handling