Commit unused lines
Bug fixes