Cleanup/removal of unnecessary functions