Cleaned up server pub calls