1.2.1 - Removed unnecessary imports