Merge "Revert "Cleaned up some slot logic""