Removed useless remaining code