Rework core namespace declaration
Remove old unused Synapse import