More testing tweaks
Remove testing stuff for now