Cleaned up unlockables manager