Removed some unused variables and code based on them
Added favlist support