Cache document
Remove unused methods, some visual changes