Big cleanup, this version is probably not working well