Built remove feature, needing to build class and use it instead of functions