Hard coded Schema and code clean up