Cleaned up selectables code