Removed older versions, useless code