Removed not ready yet functions