Refactoring, some things were deleted