Generic Manager implemented and unused code removed