Build: optimizing & removing selectors out of desparation