Cleaning up warnings in all activity files