Cleaned duplicates

Had unnecessary duplicate functions for testing’s sake that
accidentally got added in. The extra ones have been deleted and the
rest got moved back to the kernel, where they belong.