XML Cleanup

Cleared warnings in all XML files and removed layouts no longer being
used.