Documentation and removal of silly functions