Comment out not working methods