Removed nonused rubbish