Removed unused functions and added ;;;###autoload