Revert "Started to add requested features"

This reverts commit 37f672752130c91494bee7b82be7bf103c8b23ca.