Some refactorings, Removed Membership framework from project