removed and deprecated some methods
completed refector
Merge branch 'feature/refactor-clean' into develop