Some cleanup and moving
Remove is_online for now