Refactor, remove unused/unessential functions.