More cleanup
Fixing lint complaints, removing unused resources