Commented out not needed features