Removed most singleton patterns. Resolves #181
Merge from bleeding