ApiDocs + cleanup