Cleaned up old synapse stuff