Removed unusefull API functionlity