Removed SPRINT 5 warnings