Refactor: Remove options from partial