Added references, removed useless stuff