#50. Removed the code corresponding to other issues. Left only the code connected to #50