Remove json requests - will implement in seperate API