Remove unused/tested code