Code cleanup; remove unused methods and fields
Updates to branding images