Added specific resource and selector cleanup methods