Removed stuff that are covered by functions