Removed unnecessary slot stuff