Hopefully the last clean up