Remove unneeded and clean up a little