Remove cruft from application options
Update extension building