[Core] Removed SSP Dependency;
[Core] Minor code tweaks;