Removed unnecessary generation stuff