sort our Slots
code cleanup: warning removal + TODO removal