Removed unused code on Schema and Result