Removed non-core functional