Removed unnecessary finals