Remove merge errors
Cleanup and refactor lectire