Removed unused includes and updated config
Removed unused pages