Removed some fluffy workarounds now that i can access the mock api.