remove unused function
Merge branch 'conversion' of github.com:sharewave/frontus into conversion
undo conversion change
Merge branch 'conversion' of https://github.com/sharewave/frontus into conversion
Merge branch 'conversion' into testing