Clean up dependencies
Temporarily disable pagination due to weird bug... to be discussed later