Cleanup and updating to latest gems