Fix some memory leaks
Add function for content-remove, but not implemented