Small bug fix, cleanup of unused files